From d7c5a6b626ddcf2eda37180b25d4a71faa5f3737 Mon Sep 17 00:00:00 2001 From: Behnam Esfahbod Date: Wed, 30 Aug 2017 18:16:52 -0700 Subject: [PATCH] [src/doc/book] Update 03-01-specifying-dependencies.md from specifying-dependencies.md --- src/doc/MIGRATION_MAP | 2 +- src/doc/book/src/03-01-specifying-dependencies.md | 10 +++++----- src/doc/specifying-dependencies.md | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/doc/MIGRATION_MAP b/src/doc/MIGRATION_MAP index 51b471ed5..c239954e2 100644 --- a/src/doc/MIGRATION_MAP +++ b/src/doc/MIGRATION_MAP @@ -10,4 +10,4 @@ manifest.md book/src/03-02-manifest.md pkgid-spec.md book/src/03-07-pkgid-spec.md policies.md book/src/03-10-policies.md source-replacement.md book/src/03-08-source-replacement.md -specifying-dependencies.md +specifying-dependencies.md book/src/03-01-specifying-dependencies.md diff --git a/src/doc/book/src/03-01-specifying-dependencies.md b/src/doc/book/src/03-01-specifying-dependencies.md index 844b9155d..962ea7349 100644 --- a/src/doc/book/src/03-01-specifying-dependencies.md +++ b/src/doc/book/src/03-01-specifying-dependencies.md @@ -47,10 +47,10 @@ be allowed with them: ^0 := >=0.0.0 <1.0.0 ``` -While SemVer says that there is no compatibility before 1.0.0, many programmers -treat a `0.x.y` release in the same way as a `1.x.y` release: that is, `y` is -incremented for bugfixes, and `x` is incremented for new features. As such, -Cargo considers a `0.x.y` and `0.x.z` version, where `z > y`, to be compatible. +This compatibility convention is different from SemVer in the way it treats +versions before 1.0.0. While SemVer says there is no compatibility before +1.0.0, Cargo considers `0.x.y` to be compatible with `0.x.z`, where `y ≥ z` +and `x > 0`. ### Tilde requirements @@ -173,7 +173,7 @@ dependencies but "libraries" do not. The desire to override a dependency or otherwise alter some dependencies can arise through a number of scenarios. Most of them, however, boil down to the -ability to to work with a crate before it's been published to crates.io. For +ability to work with a crate before it's been published to crates.io. For example: * A crate you're working on is also used in a much larger application you're diff --git a/src/doc/specifying-dependencies.md b/src/doc/specifying-dependencies.md index e009c64d8..d3fa7627f 100644 --- a/src/doc/specifying-dependencies.md +++ b/src/doc/specifying-dependencies.md @@ -47,9 +47,9 @@ be allowed with them: ^0 := >=0.0.0 <1.0.0 ``` -This compatibility convention is different from SemVer in the way it treats -versions before 1.0.0. While SemVer says there is no compatibility before -1.0.0, Cargo considers `0.x.y` to be compatible with `0.x.z`, where `y ≥ z` +This compatibility convention is different from SemVer in the way it treats +versions before 1.0.0. While SemVer says there is no compatibility before +1.0.0, Cargo considers `0.x.y` to be compatible with `0.x.z`, where `y ≥ z` and `x > 0`. ## Tilde requirements -- 2.30.2